Merge
authorIan Jackson <Ian.Jackson@eu.citrix.com>
Mon, 17 Jan 2011 17:24:21 +0000 (17:24 +0000)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Mon, 17 Jan 2011 17:24:21 +0000 (17:24 +0000)

Trivial merge